Change a couple more template parameter names from 'T' to '_Tp', etc. Thanks to OndrĖej Majerech for the patch, but I did a bit more. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@225598 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__locale b/include/__locale index 0097fc2..42cf4d9 100644 --- a/include/__locale +++ b/include/__locale
@@ -1420,7 +1420,7 @@ // template <class charT> class numpunct_byname -template <class charT> class _LIBCPP_TYPE_VIS_ONLY numpunct_byname; +template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY numpunct_byname; template <> class _LIBCPP_TYPE_VIS numpunct_byname<char>
diff --git a/include/atomic b/include/atomic index 7a6dd24..0427a91 100644 --- a/include/atomic +++ b/include/atomic
@@ -551,26 +551,26 @@ #if _GNUC_VER >= 407 namespace __gcc_atomic { -template <typename T> +template <typename _Tp> struct __gcc_atomic_t { __gcc_atomic_t() _NOEXCEPT {} - explicit __gcc_atomic_t(T value) _NOEXCEPT : __a_value(value) {} - T __a_value; + explicit __gcc_atomic_t(_Tp value) _NOEXCEPT : __a_value(value) {} + _Tp __a_value; }; #define _Atomic(x) __gcc_atomic::__gcc_atomic_t<x> -template <typename T> T __create(); +template <typename _Tp> _Tp __create(); -template <typename __Tp, typename __Td> -typename enable_if<sizeof(__Tp()->__a_value = __create<__Td>()), char>::type +template <typename _Tp, typename _Td> +typename enable_if<sizeof(_Tp()->__a_value = __create<_Td>()), char>::type __test_atomic_assignable(int); -template <typename T, typename U> +template <typename _Tp, typename _Up> __two __test_atomic_assignable(...); -template <typename __Tp, typename __Td> +template <typename _Tp, typename _Td> struct __can_assign { static const bool value = - sizeof(__test_atomic_assignable<__Tp, __Td>(1)) == sizeof(char); + sizeof(__test_atomic_assignable<_Tp, _Td>(1)) == sizeof(char); }; static inline constexpr int __to_gcc_order(memory_order __order) { 